From 38db8d1951fab8514b1412c5d9c98236bb36eb92 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 18 Aug 1998 22:22:22 +0000 Subject: [PATCH] allow argument parsing in gtk without G_ENABLE_DEBUG being defined Wed Aug 19 00:11:14 1998 Tim Janik * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without G_ENABLE_DEBUG being defined (specifically --gtk-module= and --g-fatal-warnings), noticed by miguel. --- ChangeLog | 6 +++ ChangeLog.pre-2-0 | 6 +++ ChangeLog.pre-2-10 | 6 +++ ChangeLog.pre-2-2 | 6 +++ ChangeLog.pre-2-4 | 6 +++ ChangeLog.pre-2-6 | 6 +++ ChangeLog.pre-2-8 | 6 +++ gtk/gtkmain.c | 101 +++++++++++++++++++++++---------------------- 8 files changed, 93 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index efea492b7e..39c307eeee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index efea492b7e..39c307eeee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Aug 19 00:11:14 1998 Tim Janik + + * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without + G_ENABLE_DEBUG being defined (specifically --gtk-module= and + --g-fatal-warnings), noticed by miguel. + Tue Aug 18 17:54:40 1998 Tim Janik * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 892098685a..b2b8e1f203 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -260,6 +260,7 @@ gtk_init (int *argc, gtk_debug_keys, gtk_ndebug_keys); } +#endif /* G_ENABLE_DEBUG */ if (argc && argv) { @@ -267,55 +268,13 @@ gtk_init (int *argc, for (i = 1; i < *argc;) { - if ((strcmp ("--gtk-debug", (*argv)[i]) == 0) || - (strncmp ("--gtk-debug=", (*argv)[i], 12) == 0)) - { - gchar *equal_pos = strchr ((*argv)[i], '='); - - if (equal_pos != NULL) - { - gtk_debug_flags |= g_parse_debug_string (equal_pos+1, - gtk_debug_keys, - gtk_ndebug_keys); - } - else if ((i + 1) < *argc && (*argv)[i + 1]) - { - gtk_debug_flags |= g_parse_debug_string ((*argv)[i+1], - gtk_debug_keys, - gtk_ndebug_keys); - (*argv)[i] = NULL; - i += 1; - } - (*argv)[i] = NULL; - } - else if ((strcmp ("--gtk-no-debug", (*argv)[i]) == 0) || - (strncmp ("--gtk-no-debug=", (*argv)[i], 15) == 0)) - { - gchar *equal_pos = strchr ((*argv)[i], '='); - - if (equal_pos != NULL) - { - gtk_debug_flags &= ~g_parse_debug_string (equal_pos+1, - gtk_debug_keys, - gtk_ndebug_keys); - } - else if ((i + 1) < *argc && (*argv)[i + 1]) - { - gtk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1], - gtk_debug_keys, - gtk_ndebug_keys); - (*argv)[i] = NULL; - i += 1; - } - (*argv)[i] = NULL; - } - else if (strcmp ("--gtk-module", (*argv)[i]) == 0 || - strncmp ("--gtk-module=", (*argv)[i], 13) == 0) + if (strcmp ("--gtk-module", (*argv)[i]) == 0 || + strncmp ("--gtk-module=", (*argv)[i], 13) == 0) { GModule *module = NULL; GtkModuleInitFunc modinit_func = NULL; gchar *module_name = (*argv)[i] + 12; - + if (*module_name == '=') module_name++; else @@ -362,15 +321,59 @@ gtk_init (int *argc, else if (strcmp ("--g-fatal-warnings", (*argv)[i]) == 0) { GLogLevelFlags fatal_mask; - + fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; g_log_set_always_fatal (fatal_mask); (*argv)[i] = NULL; } +#ifdef G_ENABLE_DEBUG + else if ((strcmp ("--gtk-debug", (*argv)[i]) == 0) || + (strncmp ("--gtk-debug=", (*argv)[i], 12) == 0)) + { + gchar *equal_pos = strchr ((*argv)[i], '='); + + if (equal_pos != NULL) + { + gtk_debug_flags |= g_parse_debug_string (equal_pos+1, + gtk_debug_keys, + gtk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) + { + gtk_debug_flags |= g_parse_debug_string ((*argv)[i+1], + gtk_debug_keys, + gtk_ndebug_keys); + (*argv)[i] = NULL; + i += 1; + } + (*argv)[i] = NULL; + } + else if ((strcmp ("--gtk-no-debug", (*argv)[i]) == 0) || + (strncmp ("--gtk-no-debug=", (*argv)[i], 15) == 0)) + { + gchar *equal_pos = strchr ((*argv)[i], '='); + + if (equal_pos != NULL) + { + gtk_debug_flags &= ~g_parse_debug_string (equal_pos+1, + gtk_debug_keys, + gtk_ndebug_keys); + } + else if ((i + 1) < *argc && (*argv)[i + 1]) + { + gtk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1], + gtk_debug_keys, + gtk_ndebug_keys); + (*argv)[i] = NULL; + i += 1; + } + (*argv)[i] = NULL; + } +#endif /* G_ENABLE_DEBUG */ i += 1; } - + for (i = 1; i < *argc; i++) { for (k = i; k < *argc; k++) @@ -386,9 +389,7 @@ gtk_init (int *argc, } } } - -#endif /* G_ENABLE_DEBUG */ - + /* Check if there is a good chance the mb functions will handle things * correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the * C locale, or we're using X's mb functions. (-DX_LOCALE && locale != C) -- 2.30.2